x86: fix pv cpuid masking

Invert initial values of the variables parsed into from the command
line, so that completely clearing out one or more of the four bit
fields is possible.

Further, consolidate the command line parameter specifications into
a single place.

Finally, as per "Intel Virtualization Technology FlexMigration
Application Note" (http://www.intel.com/Assets/PDF/manual/323850.pdf),
also handle family 6 model 0x1f.

What remains open is the question whether pv_cpuid() shouldn't also
consume these masks.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 2d4192be4f606d42fb9cc6b3a5c525a323f42482..ec378a2a8c0f82c5e269ece985dc02bec8cb7e2d 100644 (file)
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -32,14 +32,6 @@
 static char opt_famrev[14];
 string_param("cpuid_mask_cpu", opt_famrev);
 
-/* Finer-grained CPUID feature control. */
-static unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx;
-integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx);
-integer_param("cpuid_mask_edx", opt_cpuid_mask_edx);
-static unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx;
-integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx);
-integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx);
-
 static inline void wrmsr_amd(unsigned int index, unsigned int lo, 
                unsigned int hi)
 {
@@ -60,7 +52,7 @@ static inline void wrmsr_amd(unsigned int index, unsigned int lo,
  *
  * The processor revision string parameter has precedene.
  */
-static void __devinit set_cpuidmask(struct cpuinfo_x86 *c)
+static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c)
 {
        static unsigned int feat_ecx, feat_edx;
        static unsigned int extfeat_ecx, extfeat_edx;
@@ -75,12 +67,12 @@ static void __devinit set_cpuidmask(struct cpuinfo_x86 *c)
        ASSERT((status == not_parsed) && (smp_processor_id() == 0));
        status = no_mask;
 
-       if (opt_cpuid_mask_ecx | opt_cpuid_mask_edx |
-           opt_cpuid_mask_ext_ecx | opt_cpuid_mask_ext_edx) {
-               feat_ecx = opt_cpuid_mask_ecx ? : ~0U;
-               feat_edx = opt_cpuid_mask_edx ? : ~0U;
-               extfeat_ecx = opt_cpuid_mask_ext_ecx ? : ~0U;
-               extfeat_edx = opt_cpuid_mask_ext_edx ? : ~0U;
+       if (~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx &
+             opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) {
+               feat_ecx = opt_cpuid_mask_ecx;
+               feat_edx = opt_cpuid_mask_edx;
+               extfeat_ecx = opt_cpuid_mask_ext_ecx;
+               extfeat_edx = opt_cpuid_mask_ext_edx;
        } else if (*opt_famrev == '\0') {
                return;
        } else if (!strcmp(opt_famrev, "fam_0f_rev_c")) {

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 021ecd8ea7bc7b90ef87aa92579c44aa902aa6ae..0264023f4e83353b765ea8ab8420920255c58e52 100644 (file)
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -22,6 +22,15 @@ static int cachesize_override __cpuinitdata = -1;
 static int disable_x86_fxsr __cpuinitdata;
 static int disable_x86_serial_nr __cpuinitdata;
 
+unsigned int __devinitdata opt_cpuid_mask_ecx = ~0u;
+integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx);
+unsigned int __devinitdata opt_cpuid_mask_edx = ~0u;
+integer_param("cpuid_mask_edx", opt_cpuid_mask_edx);
+unsigned int __devinitdata opt_cpuid_mask_ext_ecx = ~0u;
+integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx);
+unsigned int __devinitdata opt_cpuid_mask_ext_edx = ~0u;
+integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx);
+
 struct cpu_dev * cpu_devs[X86_VENDOR_NUM] = {};
 
 /*

diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h
index 5a1d4f163e84d6ff75a28aa91c6c65e3b53a717a..bdecc266310e5910eb6f3f71ef079a52c06cd151 100644 (file)
--- a/xen/arch/x86/cpu/cpu.h
+++ b/xen/arch/x86/cpu/cpu.h
@@ -21,6 +21,9 @@ struct cpu_dev {
 
 extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM];
 
+extern unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx;
+extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx;
+
 extern int get_model_name(struct cpuinfo_x86 *c);
 extern void display_cacheinfo(struct cpuinfo_x86 *c);
 

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index 1017a5029ab9e0bb4525d30375de535ae5ef781e..cccfa4bf142a05b63c2672083acb8b048c9e5b44 100644 (file)
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -20,19 +20,6 @@
 
 extern int trap_init_f00f_bug(void);
 
-/*
- * opt_cpuid_mask_ecx/edx: cpuid.1[ecx, edx] feature mask.
- * For example, E8400[Intel Core 2 Duo Processor series] ecx = 0x0008E3FD, 
- * edx = 0xBFEBFBFF when executing CPUID.EAX = 1 normally. If you want to
- * 'rev down' to E8400, you can set these values in these Xen boot parameters.
- */
-static unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx;
-integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx);
-integer_param("cpuid_mask_edx", opt_cpuid_mask_edx);
-static unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx;
-integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx);
-integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx);
-
 static int use_xsave = 1;
 boolean_param("xsave", use_xsave);
 
@@ -43,46 +30,57 @@ boolean_param("xsave", use_xsave);
 struct movsl_mask movsl_mask __read_mostly;
 #endif
 
-static void __devinit set_cpuidmask(struct cpuinfo_x86 *c)
+/*
+ * opt_cpuid_mask_ecx/edx: cpuid.1[ecx, edx] feature mask.
+ * For example, E8400[Intel Core 2 Duo Processor series] ecx = 0x0008E3FD,
+ * edx = 0xBFEBFBFF when executing CPUID.EAX = 1 normally. If you want to
+ * 'rev down' to E8400, you can set these values in these Xen boot parameters.
+ */
+static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c)
 {
-       unsigned int model = c->x86_model;
-
-       if (!(opt_cpuid_mask_ecx | opt_cpuid_mask_edx | 
-             opt_cpuid_mask_ext_ecx | opt_cpuid_mask_ext_edx))
-               return;
+       const char *extra = "";
 
-       if (c->x86 != 0x6)      /* Only family 6 supports this feature  */
+       if (!~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx &
+              opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx))
                return;
 
-       if ((model == 0x1d) || ((model == 0x17) && (c->x86_mask >= 4))) {
-               wrmsr(MSR_IA32_CPUID_FEATURE_MASK1,
-                     opt_cpuid_mask_ecx ? : ~0u,
-                     opt_cpuid_mask_edx ? : ~0u);
-       }
+       /* Only family 6 supports this feature  */
+       switch ((c->x86 == 6) * c->x86_model) {
+       case 0x17:
+               if ((c->x86_mask & 0x0f) < 4)
+                       break;
+               /* fall through */
+       case 0x1d:
+               wrmsr(MSR_INTEL_CPUID_FEATURE_MASK,
+                     opt_cpuid_mask_ecx,
+                     opt_cpuid_mask_edx);
+               if (!~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx))
+                       return;
+               extra = "extended ";
+               break;
 /* 
  * CPU supports this feature if the processor signature meets the following:
  * (CPUID.(EAX=01h):EAX) > 000106A2h, or
  * (CPUID.(EAX=01h):EAX) == 000106Exh, 0002065xh, 000206Cxh, 000206Exh, or 000206Fxh
  *
  */
-       else if (((model == 0x1a) && (c->x86_mask > 2))
-                || model == 0x1e
-                || model == 0x25 
-                || model == 0x2c 
-                || model == 0x2e 
-                || model == 0x2f) {
-               wrmsr(MSR_IA32_CPUID1_FEATURE_MASK,
-                     opt_cpuid_mask_ecx ? : ~0u,
-                     opt_cpuid_mask_edx ? : ~0u);
-               wrmsr(MSR_IA32_CPUID80000001_FEATURE_MASK,
-                     opt_cpuid_mask_ext_ecx ? : ~0u,
-                     opt_cpuid_mask_ext_edx ? : ~0u);
-       }
-       else {
-               printk(XENLOG_ERR "Cannot set CPU feature mask on CPU#%d\n",
-                      smp_processor_id());
+       case 0x1a:
+               if ((c->x86_mask & 0x0f) <= 2)
+                       break;
+               /* fall through */
+       case 0x1e: case 0x1f:
+       case 0x25: case 0x2c: case 0x2e: case 0x2f:
+               wrmsr(MSR_INTEL_CPUID1_FEATURE_MASK,
+                     opt_cpuid_mask_ecx,
+                     opt_cpuid_mask_edx);
+               wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK,
+                     opt_cpuid_mask_ext_ecx,
+                     opt_cpuid_mask_ext_edx);
                return;
        }
+
+       printk(XENLOG_ERR "Cannot set CPU feature mask on CPU#%d\n",
+              smp_processor_id());
 }
 
 void __devinit early_intel_workaround(struct cpuinfo_x86 *c)

diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h
index fad45b3437b63662162150fe466614ab179c1511..1db710156cffab2c0f3cc6b0796f263627ea3f60 100644 (file)
--- a/xen/include/asm-x86/msr-index.h
+++ b/xen/include/asm-x86/msr-index.h
@@ -156,10 +156,10 @@
 #define MSR_P6_EVNTSEL0                        0x00000186
 #define MSR_P6_EVNTSEL1                        0x00000187
 
-/* MSR for cpuid feature mask */
-#define MSR_IA32_CPUID_FEATURE_MASK1   0x00000478
-#define MSR_IA32_CPUID1_FEATURE_MASK    0x00000130
-#define MSR_IA32_CPUID80000001_FEATURE_MASK 0x00000131
+/* MSRs for Intel cpuid feature mask */
+#define MSR_INTEL_CPUID_FEATURE_MASK   0x00000478
+#define MSR_INTEL_CPUID1_FEATURE_MASK  0x00000130
+#define MSR_INTEL_CPUID80000001_FEATURE_MASK 0x00000131
 
 /* MSRs & bits used for VMX enabling */
 #define MSR_IA32_VMX_BASIC                      0x480